merge
authorIan Campbell <ian.campbell@xensource.com>
Thu, 24 May 2007 08:15:58 +0000 (09:15 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Thu, 24 May 2007 08:15:58 +0000 (09:15 +0100)

Trivial merge